Split destinator, unicsv, nmea, and interpolate out into tehir own tests.

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
index b7e833e37246b754ff2e789d41c9e1e4e02c3317..d587a745ccacf2b616a9cea01f41b3d34bbf9995 100644 (file)
--- a/gpsbabel/testo.d/classic-3.test
+++ b/gpsbabel/testo.d/classic-3.test
@@ -60,42 +60,6 @@ gpsbabel -i gpx -f ${TMPDIR}/alltypes.gpx -x nuketypes,waypoints,tracks -o gpx -
 gpsbabel -i gpx -f ${TMPDIR}/wpts.gpx -f ${TMPDIR}/trks.gpx -f ${TMPDIR}/rtes.gpx -o gpx -F ${TMPDIR}/merged.gpx
 compare ${TMPDIR}/alltypes.gpx ${TMPDIR}/merged.gpx
 
-#
-# Interpolate filter
-# 
-
-gpsbabel -i gpx -f ${REFERENCE}/track/simpletrack.gpx -x interpolate,distance=50m -o gpx -F ${TMPDIR}/interp.gpx
-compare ${REFERENCE}/track/interptrack.gpx ${TMPDIR}/interp.gpx 
-gpsbabel -i gpx -f ${REFERENCE}/track/simpletrack.gpx -x interpolate,time=1 -o gpx -F ${TMPDIR}/tinterp.gpx
-compare ${REFERENCE}/track/tinterptrack.gpx ${TMPDIR}/tinterp.gpx 
-
-#
-# Universal CSV - unicsv
-#
-echo "lat,lon,descr,name,notes,unk,unk" > ${TMPDIR}/unicsv.txt
-cat ${REFERENCE}/mxf.mxf >> ${TMPDIR}/unicsv.txt
-gpsbabel -i unicsv -f ${TMPDIR}/unicsv.txt -o gpx -F ${TMPDIR}/unicsv.gpx
-compare ${TMPDIR}/unicsv.gpx ${REFERENCE}/unicsv.gpx
-gpsbabel -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -x nuketypes,routes,tracks -o unicsv -F ${TMPDIR}/garmin_txt-uni.csv
-compare ${TMPDIR}/garmin_txt-uni.csv ${REFERENCE}/garmin_txt-uni.csv
-
-#
-# Basic NMEA tests
-#
-gpsbabel -i nmea -f ${REFERENCE}/track/nmea -o gpx -F ${TMPDIR}/nmea.gpx
-compare ${TMPDIR}/nmea.gpx ${REFERENCE}/track/nmea.gpx
-gpsbabel -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o gpx -F ${TMPDIR}/nmea+ms.gpx
-compare ${TMPDIR}/nmea+ms.gpx ${REFERENCE}/track/nmea+ms.gpx
-
-#
-# Read an NMEA file  with AMOD 3808 waypoints.  Be sure we read the points.
-# Also write as a "normal" NMEA to be sure AMOD extensions don't leak.
-#
-gpsbabel -i nmea -f ${REFERENCE}/track/amod-nmea -o gpx -F ${TMPDIR}/amod-out.gpx -o nmea -F ${TMPDIR}/amod-pure
-compare ${TMPDIR}/amod-out.gpx ${REFERENCE}/track/amod.gpx
-compare ${TMPDIR}/amod-pure ${REFERENCE}/track/amod-cleansed
-
-
 #
 # Wfff.
 #

diff --git a/gpsbabel/testo.d/classic-4.test b/gpsbabel/testo.d/classic-4.test
index 1526c9d5d56f125a6071846bae515f72dc717bb8..5c5b8945379ebf31e7429cfced2abc3d5a2011a2 100644 (file)
--- a/gpsbabel/testo.d/classic-4.test
+++ b/gpsbabel/testo.d/classic-4.test
@@ -74,21 +74,6 @@ rm -f ${TMPDIR}/osm-*
 gpsbabel -i osm -f ${REFERENCE}/osm-data.xml -o gpx -F ${TMPDIR}/osm-data.gpx
 compare ${TMPDIR}/osm-data.gpx ${REFERENCE}/osm-data.gpx
 
-# Destinator POI
-gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -o destinator_poi -F ${TMPDIR}/destinator_poi.dat
-gpsbabel -i destinator_poi -f ${TMPDIR}/destinator_poi.dat -w -o unicsv,utc=0 -F ${TMPDIR}/destinator_poi.txt
-compare ${TMPDIR}/destinator_poi.txt ${REFERENCE}/destinator_poi.txt
-
-# Destinator Itinerary
-gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -o destinator_itn -F ${TMPDIR}/destinator_itn.dat
-gpsbabel -i destinator_itn -f ${TMPDIR}/destinator_itn.dat -r -o unicsv,utc=0 -F ${TMPDIR}/destinator_itn.txt
-compare ${TMPDIR}/destinator_itn.txt ${REFERENCE}/route/destinator_itn.txt
-
-# Destinator TrackLog
-gpsbabel -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o destinator_trl -F ${TMPDIR}/destinator_trl.dat
-gpsbabel -i destinator_trl -f ${TMPDIR}/destinator_trl.dat -t -o unicsv,utc=0 -F ${TMPDIR}/destinator_trl.txt
-compare ${TMPDIR}/destinator_trl.txt ${REFERENCE}/track/destinator_trl.txt
-
 # Exif format test (read only)
 gpsbabel -i exif -f ${REFERENCE}/IMG_2065.JPG -o unicsv,utc=0 -F ${TMPDIR}/exif-dat.csv
 compare ${TMPDIR}/exif-dat.csv ${REFERENCE}/exif-dat.csv

diff --git a/gpsbabel/testo.d/destinator.test b/gpsbabel/testo.d/destinator.test
new file mode 100644 (file)
index 0000000..c00642f
--- /dev/null
+++ b/gpsbabel/testo.d/destinator.test
@@ -0,0 +1,16 @@
+
+# Destinator POI
+gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -o destinator_poi -F ${TMPDIR}/destinator_poi.dat
+gpsbabel -i destinator_poi -f ${TMPDIR}/destinator_poi.dat -w -o unicsv,utc=0 -F ${TMPDIR}/destinator_poi.txt
+compare ${TMPDIR}/destinator_poi.txt ${REFERENCE}/destinator_poi.txt
+
+# Destinator Itinerary
+gpsbabel -i gpx -f ${REFERENCE}/expertgps.gpx -o destinator_itn -F ${TMPDIR}/destinator_itn.dat
+gpsbabel -i destinator_itn -f ${TMPDIR}/destinator_itn.dat -r -o unicsv,utc=0 -F ${TMPDIR}/destinator_itn.txt
+compare ${TMPDIR}/destinator_itn.txt ${REFERENCE}/route/destinator_itn.txt
+
+# Destinator TrackLog
+gpsbabel -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o destinator_trl -F ${TMPDIR}/destinator_trl.dat
+gpsbabel -i destinator_trl -f ${TMPDIR}/destinator_trl.dat -t -o unicsv,utc=0 -F ${TMPDIR}/destinator_trl.txt
+compare ${TMPDIR}/destinator_trl.txt ${REFERENCE}/track/destinator_trl.txt
+

diff --git a/gpsbabel/testo.d/interpolate.test b/gpsbabel/testo.d/interpolate.test
new file mode 100644 (file)
index 0000000..8aa5952
--- /dev/null
+++ b/gpsbabel/testo.d/interpolate.test
@@ -0,0 +1,10 @@
+
+#
+# Interpolate filter
+# 
+
+gpsbabel -i gpx -f ${REFERENCE}/track/simpletrack.gpx -x interpolate,distance=50m -o gpx -F ${TMPDIR}/interp.gpx
+compare ${REFERENCE}/track/interptrack.gpx ${TMPDIR}/interp.gpx 
+
+gpsbabel -i gpx -f ${REFERENCE}/track/simpletrack.gpx -x interpolate,time=1 -o gpx -F ${TMPDIR}/tinterp.gpx
+compare ${REFERENCE}/track/tinterptrack.gpx ${TMPDIR}/tinterp.gpx 

diff --git a/gpsbabel/testo.d/nmea.test b/gpsbabel/testo.d/nmea.test
new file mode 100644 (file)
index 0000000..9624553
--- /dev/null
+++ b/gpsbabel/testo.d/nmea.test
@@ -0,0 +1,15 @@
+#
+# Basic NMEA tests
+#
+gpsbabel -i nmea -f ${REFERENCE}/track/nmea -o gpx -F ${TMPDIR}/nmea.gpx
+compare ${TMPDIR}/nmea.gpx ${REFERENCE}/track/nmea.gpx
+gpsbabel -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o gpx -F ${TMPDIR}/nmea+ms.gpx
+compare ${TMPDIR}/nmea+ms.gpx ${REFERENCE}/track/nmea+ms.gpx
+
+#
+# Read an NMEA file  with AMOD 3808 waypoints.  Be sure we read the points.
+# Also write as a "normal" NMEA to be sure AMOD extensions don't leak.
+#
+gpsbabel -i nmea -f ${REFERENCE}/track/amod-nmea -o gpx -F ${TMPDIR}/amod-out.gpx -o nmea -F ${TMPDIR}/amod-pure
+compare ${TMPDIR}/amod-out.gpx ${REFERENCE}/track/amod.gpx
+compare ${TMPDIR}/amod-pure ${REFERENCE}/track/amod-cleansed

diff --git a/gpsbabel/testo.d/unicsv.test b/gpsbabel/testo.d/unicsv.test
new file mode 100644 (file)
index 0000000..b31bb98
--- /dev/null
+++ b/gpsbabel/testo.d/unicsv.test
@@ -0,0 +1,13 @@
+#
+# Universal CSV - unicsv
+#
+
+echo "lat,lon,descr,name,notes,unk,unk" > ${TMPDIR}/unicsv.txt
+cat ${REFERENCE}/mxf.mxf >> ${TMPDIR}/unicsv.txt
+
+gpsbabel -i unicsv -f ${TMPDIR}/unicsv.txt -o gpx -F ${TMPDIR}/unicsv.gpx
+compare ${REFERENCE}/unicsv.gpx ${TMPDIR}/unicsv.gpx 
+
+gpsbabel -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -x nuketypes,routes,tracks -o unicsv -F ${TMPDIR}/garmin_txt-uni.csv
+compare ${REFERENCE}/garmin_txt-uni.csv ${TMPDIR}/garmin_txt-uni.csv 
+